Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1987 Adding CONTRIBUTING.md #433

Merged
merged 9 commits into from
Dec 5, 2022
Merged

Conversation

Bakaniko
Copy link
Collaborator

@cvvergara
Copy link
Contributor

Very challenging task you started :)

@cvvergara
Copy link
Contributor

I added as many reviwers as I could think of due to the sensitivity of the PR.
As long as there is TODO, I can not agree on the merge.
If I want to make a change I will do it by pushing to the adding_contributing.md branch on Bakaniko/OSGeoLive-doc.

CONTRIBUTING.md Show resolved Hide resolved
CONTRIBUTING.md Outdated
2. Request joining a translation team
3. Translate !
4. Please consider adding your self to our [contributor list](https://github.com/OSGeo/OSGeoLive-doc/blob/master/contributors.csv), if you don't know how to use git, please contact a maintainer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now we have the egg-hen problem.
egg = sign contirbution agreement
hen = start translating, we will use your translations

the hen is already given, but we didnt have the egg

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Make the Pull Request (PR)

CONTRIBUTING.md Outdated

## Code of Conduct

**Bakaniko's comment:** This part was part of the template, it can be
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be in a separate file

@cvvergara
Copy link
Contributor

I wonder, because we have 2 repositories, what ever is on one repo, must be also on the other repo

@cvvergara
Copy link
Contributor

Contributions via mail for example, I remember last year Steve made a contribution via mail that bakaniko added to the repo. What if Steve has had not signed the contirbution agreement, then bakaniko could not being able to use that contribution.
Changes to the wiki's are considered contributions? if so, what license do they have?

Copy link
Collaborator

@bencaradocdavies bencaradocdavies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the contributor agreement and code of conduct should be links to OSGeo resources, to reduce duplication and centralise on the authoritative legal entity.

I would prefer some text like "By submitting content to this project, you agree to be bound by the OSGeo contributor agreement [link]. If you contribution is more than a small fix to an existing file, please send a signed contributor agreement to [...]".

@bencaradocdavies
Copy link
Collaborator

It would be interesting to compare the OSGeo code of conduct with the Contributor Covenant. The Linux kernel community has recently adopted a version of the covenant.

Follows Jody's recommendations [1] and adding contributor licensing agreement and OBVIOUS FIX rule 

[1] https://lists.osgeo.org/pipermail/osgeolive/2018-September/013593.html
CONTRIBUTING.md Outdated

The CLA makes everyone’s rights clear:

You (or your company) grant copyright license for your contributions to CARTO.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still has mention of CARTO.

Copy link
Collaborator Author

@Bakaniko Bakaniko Oct 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad copy/paste I'll check better.

@astroidex
Copy link
Member

@Bakaniko @cvvergara shall we take this file to 13.0 version? Still afterwards changes can be done if needed.

@Bakaniko
Copy link
Collaborator Author

@astroidex , maybe the simple way is the one suggested by @bencaradocdavies : refer to OSGeo resources.
Let's talk about it next meeting

Copy link
Member

@astroidex astroidex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refers to this ticket: https://trac.osgeo.org/osgeolive/ticket/2179
Shall we add a Code of Conduct file and link to it?

CONTRIBUTING.md Outdated
2. Request joining a translation team
3. Translate !
4. Please consider adding your self to our [contributor list](https://github.com/OSGeo/OSGeoLive-doc/blob/master/contributors.csv), if you don't know how to use git, please contact a maintainer.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Make the Pull Request (PR)

CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
Copy link
Member

@astroidex astroidex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. See comments.

CONTRIBUTING.md Show resolved Hide resolved
CONTRIBUTING.md Outdated
1. Create an account or login on [Transifex](https://www.transifex.com/osgeo/osgeolive/)
2. Request joining a translation team
3. Translate !
4. Please consider adding your self to our [contributor list](https://github.com/OSGeo/OSGeoLive-doc/blob/master/contributors.csv), if you don't know how to use git, please contact a maintainer.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yourself not your self

@cvvergara cvvergara marked this pull request as draft October 2, 2021 17:57
@kalxas
Copy link
Member

kalxas commented Dec 3, 2022

Hi all, we are still missing a contribution guide, can we please review and merge?

CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
@kalxas kalxas marked this pull request as ready for review December 5, 2022 08:20
@kalxas kalxas merged commit a1343c5 into OSGeo:master Dec 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants